dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ec10270 0c29a61)

author	Eli Zaretskii <eliz@gnu.org>
	Fri, 2 Nov 2012 09:00:44 +0000 (11:00 +0200)
committer	Eli Zaretskii <eliz@gnu.org>
	Fri, 2 Nov 2012 09:00:44 +0000 (11:00 +0200)
commit	398de2f9286a51db8163d12fca8600e33c38b638
tree	17a816821cf3f056cf29bdf95bf162f1316b51fc	tree \| snapshot
parent	ec102704a19a3d9967adebc1b9e8e113a59b3880	commit \| diff
parent	0c29a61616fb1915974cec3c294c9c69bd7a4766	commit \| diff

Merge from trunk after 24.3 was moved to emacs-24 branch.

lib-src/ChangeLog	diff1 \|	diff2 \|	blob \| history
lib-src/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/w32fns.c	diff1 \|	diff2 \|	blob \| history
src/w32proc.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.